minor additions to combat tests