move some to test