Bug 1108975 - Change the unit test infrastructure

Nope, that's something from the old template file that apparently isn't needed anymore. I'll remove it