Fix test breakage under 4.0.0a2 due to deprecation strategy.
Prep 4.0.0a3 release.
svb