Added the fixed version of combat to the combat test