minor improvements in test scripts