Move tests across to new locations