Further changes for parallel test.
Further changes for parallel test.

ama-jharrison/agdc,smr547/agdc,smr547/agdc,sixy6e/agdc,sixy6e/agdc,jeremyh/agdc,GeoscienceAustralia/agdc,GeoscienceAustralia/agdc,jeremyh/agdc,alex-ip/agdc,ama-jharrison/agdc,alex-ip/agdc