Clean comments, update expected exception.
Correct syntax in pytest.raises().
Merge pull request #1854 from bpindelski/rebased/develop/test2628

Fix intermittent test failures in OmeroPy-integration-stable. (rebased onto develop)