Fixing up the tests so that they will run in firefox xpcshell tests properly