Fix tests after 9425c0f6d0134a65b0e22d9971923d03f83dcfa8