Fix failing tests caused by f97e9775ac1deb0594b8086936a569e9a5123976