OGM-236 Some test code simplifications