fix tests
(cherry picked from commit c7c226153308894c27c86f5ad60d3730bd19c78d)