Improves test.
Reduces and improves comments.