Merge "Address a few unittest comments."