Fixes need fixing

- Some broken assumptions rectified: GivenNone goes in the Initial State
not the Given State & When needz tezting