Issue #231 test and scenario fix