DATAREST-219: Update to make tests work

This moves the test case forward to where it now fails based on
getting a null when it asserts there isn't one.

NOTE: I didn't understand @ollie's third point in the PR