vastly improved test script options