Simplified some test suite scripting.