review keyword chain readability in test scenarios

[rdeltour]

The removal of some errors/warning means some scenarios that were previously written as "When … Then … And …" now read "When … And …", which would be more understandable as "When … Then …".

This is mostly cosmetics (since keywords can be used interchangeably), but would improve test readability.

We need to make a pass over all the tests to fix that wherever that happens.