Update test to run with domain1.6 and add unzip magic to support 6.2.x and 6.x branch