Move tests to the relevant subdirectories