Improved testing support