More test coverage for test generator