Update spec_helper for more consistency