Changes to DTW & TestGestures