Move tests to subfolder