Increased test coverage.
Added combat time log.

Tests are failing, and combat end stuff is not needed.