Merge "Fix a failed test because of passing wrong type of arguments."