Final round of test fixes in omero-server