Fix our shim WhenAny implementation and add tests for it