ACCESS-117: Fix test failures in policy engine introduced by ACCESS-95