Pooja : Added new scenarios and implementation for some steps -WIP