Move the test around a bit more