Added RifleSquad to USMC units. Extended combat tests.
Further tidied combat tests.