Fix tests after f8d435605c54c89ded54edb416903828d3ed44be rename