A few more updates to the core class rspec tests.