refactored rspec tests again