Nitpicking before pulling this in, but most `Given` are misspelled in this fixture
Also add new lines between sections

```
//Given
code..

// When
code..

// Then
code..
```

in the tests