ISSUE#251. Cleanup the language for the reviews. Run the code formatter.
Merge branch 'testing-fixes' into current-sprint