Move tests to test paths