added new test and fixed scenario builder