Fixed some nigglies in the test