Better cancelling and better tests.