Fixed spec_helper conflict