#11 improve test scripts