Update test fixtures, partial backport of 248cad83