Fixed: several test suite errors appearing on the fresh master checkout.