Added a before and after scenario block