Fix and tests for empty argument handling