Bug 1027151 - Fix Unit Tests