Fixed some broken tests
Fixed some broken tests


Former-commit-id: eca0dc507928d5389186eff74cf83b5dcf95b382 [formerly 88f3a716416e376666b0e68b5c331f9637f09e30]
Former-commit-id: 9b015973391b4760c6db4e0e53b5a85e04352505
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine