improved touch test + wd upgrade
Merge pull request #2279 from sebv/touch-test

improved touch test + wd upgrade