More fixes to reduce spec side-effects

Making more idiomatic use of rspec to avoid side-effects. These were missed in PR #179.