Bug 11629: (follow-up) add unit tests