Fix failing tests
Fix failing tests


Former-commit-id: 2583a97ea1145d6ebf8af5d02953d3bae16baa31 [formerly b91b1f6533bdc3fa8e57d5ffb5cc1994b4949236]
Former-commit-id: a0e13700c033820cebbfaf352b0680af57ab1c2e
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine