update args management, need to update test