Clean up spec_helper and rails_helper