Bugfixes for test battles.