Moved tests to different directory