DataGatherer completed and tests
Constants and test class