Moved tests to different directories