Rewrote and updated tests for generator to increase code coverage