improved testing support