Tests using the new WheelEvent trigger logic time out under WK1. This needs to be fixed so that WK1 tests can get rid of the arbitrary timeouts currently being used.