Fix some problems where the value of ERROR was leaking through to other tests can causing false-positive test failures.
Authored by: david_costanzo 2008-04-20
Parent: [r2647]
Child: [r2649]
