Follow up for bug 5880: Improved unit test