Slightly improved testing system.