Bug 887914 - Unit tests execute all top-level code before any test cases
Merge pull request #1611 from erikvold/887914v2

Bug 887914 - Unit tests execute all top-level code before any test cases r=@jsantell