Develop-only Python test fixes

This PR will collect together various fixes to the Python tests that are specific to develop.

The ```OmeroPy-integration-develop``` job is now passing and so this PR can be reviewed.