Issue #231 scenario fixes