Rspec fixes

Fix the currently broken specs.