Moved tests to subdirectory