More tests; more accurate comments.