Updated testscript and folder structure