Cleanup rspec with new support file