Added and updated testscript