Fix generator
WIP adding tests
Update tests and remove unused dummy file