First part of fixing rspec tests