Fixing test scenarios