Comment modifications to ensure consistency.
fix typos in unit tests
consistency fixes finished