Need to see if AetherDataGenerators can be simplified to be static and use method generics to avoid having to create a new object for each data generator.