Bug 924233 - Fix broken unit test in system