Added Scenarios and modified hooks.rb
merge conflict
resolved merge conflict