Updates to touch, and unit test