Bug 10243: (follow-up) add unit tests