rework on stories and BDD scenario