improved testing scripts