Hot fix to resolve CRAN issues in the unit tests. Will also introduce a few other fixes and improvements.

All work will be integrated on the hotfix1.7.4 branch to prepare for this release.