did weird things to avoid double seeing a testscript when added
fixed another bug