Improve rspec tests.