Bug 816610 - Fix unit tests