OGM-452 Making strategy configurable; Duplicating test for now to test both strategies