fix remaining rspec tests