improved testing isolation