Improvement to touchtest.