move some tests