Added tests for EntityGenerator change