Updating given/when/then for 2.0