Improved testing methods