I also noticed some of the comments in the tests are stale or not really correct, so I fixed them, too.