Bug 20563: (follow-up) Add unit test