Moved tests that require data into correct TestCase.