Refactored targeting, all tests but Abusive Sergeant's aura pass