Remove some tests from old location