Fix tests on legacy-release