Integrate cpp fixtures

Integrating Josh's changes to OmeroCPP tests.