Bug 936507 - fix broken unit test