Added two more accessors to attackerPlayerIdx and defenderPlayerIdx, and tidied up test code to use accessors