behave: expect: removed debug lines
behave: added 2 more scenarios and necessary helpers for them and also made few fixes in steps