Develop-only Python test fixes

This PR will collect together various fixes to the Python tests that are specific to develop.

It is not yet intended for review as more commits will be made depending on the state of the ```OmeroPy-integration-develop``` job.