improve testscript
Merge branch 'master' of github.com:HiveFive/Hive