Fixing unit tests #7668

Merged
merged 1 commit into from Mar 12, 2017