make battle event ordering and tests work