Move tests around