Bug 1066671 - Minor test cleanup r=trivial