fix tests that likely broke with 2.2.1