Add local support for testing
Fix touch unit tests.