Merge pull request #186 from gm4tr1x/updateTestScriptV2