Fix tests broken in 60953ba
Merge pull request #2415 from chuckharmston/1050496

Fix tests broken in 60953ba