Renamed DataBuilder class to TestDataBuilder