Simplify unit test, add comments.