Refactored/fixed uicatalog/gestures tests