Fixes tests broken by b89e5e0, part 2
Merge pull request #1674 from chuckharmston/broken_tests_b89e5e0

Fixes tests broken by b89e5e0, part 2