Fixing some rspec failures. DHH-203