bug 6201: (follow-up) update unit tests