Added some more scenarios and started step defs