Add a bunch of comments making the test a bit clearer, and also setting the stage for next round of refactoring that will make it even prettier.