Auto-correction rules that make more sense - tests broken