Updated to xctest.
Merge branch 'develop' of github.com:elegantchaos/ECTouch into develop