Move tests around a bit