Moved tests to different folder