more test fixes
more test fixes


Former-commit-id: 1498f653ae57c90a6b36ddd3cb87a897ee994bf7 [formerly 1498f653ae57c90a6b36ddd3cb87a897ee994bf7 [formerly 5520734526235d59821a19b2956b1d42051a0ed6]]
Former-commit-id: a27e7371998d4a25172fdc691fb11fb57610a349
Former-commit-id: 83cb23057ae0a924d9cc0989633970b104bdd79a
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine