Move tests to usual place