improved testing framework