Fix for Omaha HiLo + Test