Fix tests due to SDK upgrade.