EAGLESIX-0000 Repair broken arg count tests.