Added more BDD scenarios