Moved tests under the test directory