Reverted integration test MapScope Updated license
Consolidated ClassGenerationStrategy