Syntax fixes.
Additonal tests.