Fixed some combat tests.