touch action cleanup + unit tests