cleanups for testscript