[tests] move some more stuff around