ditch given/when; tweak some tests