Fix issues with args, update tests.
Update tests.