Updated to fix breaking rspec tests.