Bug 941030 - fix unit tests r=fcampo