Add test for generator
Better DSL test