Move tests to the proper place