Improve rest test coverage on the 3.1 version of the rest API

This PR contains the work needed to test both the 3.0 and 3.1 versions of the rest api.

This is currently a WIP as I am fixing up some of the bugs I've found out of this work however I would appreciate any feedback on the approach i'm taking to accomplish this.

Edit: Ready for review.

Closes: #333

Edited by username-removed-56772