Enhance OG-Util testing: Fix tests on Bamboo