Catch up to changes in spec_helper.