Bug 1104902 - Fix unit tests