Fix tests on 2.0.0