Get things passing again with latest flipper.
Fail fast for rspec. Easier to work through changes.