Change tests to correct structure.