Bug 27971: Enhance unit tests