Move tests to good packages