Changes in Generator unit test