minimized generator.tests dependency #12
removed appInstances and hostInstances query based features