fix errors in test scripts
reorganize condel scripts
Merge branch 'error_fix' into development