Added a few missing comments.
Condensed test case code a bit by adding a private helper method.