Test branch

Please review the change made to gestureFilter. All other changes are just tests that can only help! 
I'm not entirely sure why this didn't work before. What was happening that prompted you to make this change?