Make Spreewald Safer for RSpec 3

This is a temporary measure. There's a pile of things that should be
changed, but would require a lot more effort.