Copied and updated tests for the AdvArmy class
Updated combat method to make use of queue
Updated tests to use new classes