Some minor work for building our tests.
Some minor work for building our tests.

Fairly/opencor,mirams/opencor,mirams/opencor,Fairly/opencor,mirams/opencor,mirams/opencor,mirams/opencor,Fairly/opencor,Fairly/opencor,Fairly/opencor