Fix tests for 49800b0805f256c0bcdaa29402b944ac455740e6