Merge pull request #938 from timlinux/test-fixes

Test fixes
Fix for dianne's PR on safe_qgis.utilities and safe_qigs.tools package.
Fixes for utilities test and cleanups to code conventions in test_utilities
Merge pull request #939 from akbargumbira/fixes_sprint

Fix for dianne's PR on safe_qgis.utilities and safe_qigs.tools package.
Resolved merge conflicts