Fixes for utilities test and cleanups to code conventions in test_utilities
Resolved merge conflicts
Fix fail introduced by my merge
Merge pull request #940 from timlinux/test-fixes

Test fixes