Cleaned up most fallout from migration to test specific data file