Improved testing procedures

No match.