Added tests for Touch and Timers behaviors (and some fixes along the way)

Commits are divided in concrete addition/fixes, so they can be revised one by one, instead of revising all at the same time.