move new tests out of their subdirectories