Got some broken tests working again
Got some broken tests working again


Former-commit-id: f131d7628935edaaea5aa091ab4c5d02d61bde16 [formerly f131d7628935edaaea5aa091ab4c5d02d61bde16 [formerly 27301cd41bd3376053bf0fef63255ab3b5703126]]
Former-commit-id: c5e44461474c7ef51447845ef40f47a7ad2429ee
Former-commit-id: c425a69a685b9bb04d841b86dfa4e7437bf4119c
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine