SEBA-830: Fix syntax errors and argument count mismatches

Also add some unit tests

Change-Id: Id93dd2f5a2a691b045d78cbfa7a2b1b8c30bd32b
29 files changed