Move tests in correct folder