GATEWAY-3364: fix unit test