Fixed calling extends twice, rather than once with multiple arguments
Got these tests working
Fixed generating complex types
Added cleaning up generated modules
Added missing files to manifest