Bug 1026098 - Changes to fix unit tests. p=fcampo