Add tests (they're failing due to touchtap