Reorder requires in spec_helper
Re-enable other rvms