Bug 1047292 - Clean up the test code