Merge pull request #832 from KWierso/bug847785

Bug 847785 - Update template for unit tests to the current require() usage statements r=@ochameau(cherry picked from commit b0f21bbb646e6e9f2185a467cdec14a7fc73754b)