Work around for hpcc-10537 and minor fix to tests
Merge pull request #179 from johnholt/hpcc-10537

Work around for hpcc-10537 and minor fix to tests