Old acceptData tests refactored and adapted to support new data system