Fix tests broken in e708c07
Merge pull request #2407 from chuckharmston/1052858

Fix tests broken in e708c07