SEBA-830: Fix syntax errors and argument count mismatches

Also add some unit tests

Change-Id: Id93dd2f5a2a691b045d78cbfa7a2b1b8c30bd32b
diff --git a/VERSION b/VERSION
index c043eea..6cec60f 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.2.1
+2.2.2-dev0