Merge "Add a unit test for %n."