fixed scenario setup and added further consistency checker
Authored by: grether 2011-12-13
Parent: [r17746]
Child: [r17748]