ADEN-1318 Fix the Mercury test