Basic generator tests
Fixed merge conflict
Merge branch 'Generator-Tests'