move a bunch of tests around