Move tests from subdir