Change some And to When in tests for readability.
Test tweak.