New react compatibility and make the tests pass