Arduously moved tests to the tests dir