Moved tests to a subdirectory