Move tests to test dir