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

These fixes are to address the failing tests that are occured after diannes' PR