Added geometry helper functions. Fixed test builds for touch target