Merge pull request #195 from jbrinkman/development

DNN-4847 Fix broken unit tests as a result of #194