RSpec 3 updates.

Update spec and dependencies for RSpec 3 with broken spec fixes.