Touch event fixes

Fixes issue with nonEnumDescriptor
Expands tests to cover the buggy parts

Fixes #425