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

Fix intermittent test failures in OmeroPy-integration-stable.