Updated combat test