Merge "Add test for CustomDescription"