Comments/format cleanup.
typo fix in a test