Merge "Rename test/unit/cmd directory"