Move test into the test dir