moving more tests around