Fix rspec errors/warnings