Fix test failures introduced in 88b48b01b