Merge develop changes into v0.4-fixes release branch. 

Merge the testing improvements and bug fixes from develop onto v0.4-fixes release branch in prep for v0.4.4 release.