Make inner classes in PlanGeneratorTest private, static and final