Test branch

Please review the change made to gestureFilter. All other changes are just tests that can only help!