Integrating combat into the test world