Bug 9937: Add new unit tests for new routines (introduced by bug 5343)