added more tests/bug fixes/code generator class stub