Update to make test pass again after merge