* Updated wrapper scripts with extra tests to fix issue: #39