This will hopefully get merged into the main browserid test suite