Added test combat runner, updated combat rules