Moving the test stuff around a little