Corrected test scripts
Merge remote branch 'origin/master'