Expand the scheme wrapper test
Expand the unit test some more
Attempt to fix initialization issues
Fix remaining initialization problems in new code.

Although I am not entirely happy with the pattern match init ...
Add reminder to the brand-new code ..