Backported unit test fix from release-003
Merge branch 'fixed-unit-tests' into release-003