modified args and tests