Touch event fixes

Fixes issue with nonEnumDescriptor
Expands tests to cover the buggy parts

Fixes #425
Merge pull request #429 from arv/touch-list-fix

Touch event fixes