Fix combat return, new test