Code style improvements for Unit unit test

Refs #5799
Merge branch 'bugfix/5977_unit_equals_operator' into develop