move some tests around