Fix for a slightly unreliable unit test as well as reduced unit test code duplication.
Merge remote branch 'origin' into reduced_string_duplication
Minor spacing change
Merge branch 'unstable_staging' into reduced_string_duplication
Some further reduction on string duplication.  Checked again and file size is still increasing, so will likely abandon this work again for a while.
Merge remote branch 'origin/reduced_string_duplication' into reduced_string_duplication