Bug 1108975 - Change the unit test infrastructure