(WIP) (gh-592) Fix spec tests to work with changes in #567

Still have 11 failures to work through

 265 examples, 11 failures