Improved testing framework