fix failing tests after b452c6fcdc68c3afcf89faf5d21bd5508ea7bd25