Fix rspec issues