[2.0] fixes tests

This PR attempts to fix all tests before the last `2.0` release.