(#17901) Fix failing tests
Merge pull request #157 from fhrbek/spec_fixes

(#17901) Fix failing tests