Refactor data generators to have a function that can be used in tests.
Rename classes to be called DataGenerator