fixing/removing tests that were broken by data providers moving their stuff.