Last bit of test moving

We should now be in a better, more typical location for our tests.