Bug 7593: Fix unit tests

Signed-off-by: Jared Camins-Esakov <jcamins@cpbibliography.com>
Merge branch 'bug_7593' into 3.14-master