Extending unit tests for generator
Completed specs and tests for current generators