Issue #170 #171 #172 Fix Scenario issues
Issue #170 #171 #172 Fiz Context Exception