All changes for cucumber testing done. Only one assertion error needs to  be resolved