These changes made it slightly easier for me to work out what was going on in this test. I've also fixed a typo in the comments.