Some test code cleanup.
Some test code cleanup.


Former-commit-id: bb19360754449522dfc8ce8bfb85648ad06298e0 [formerly 48aeaf1f38ca8f6301adb7f073867c91ad8457b1]
Former-commit-id: 3c7900040f0315c3a6415501dcd40beb5affe89c
gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine,gem/oq-engine