Cleanup rspec warnings