Use "with" rather than "when" to name a context that defines a Given
Merge branch 'patch-2'