move some more nose tests around