Fix failing tests

Fixes #17055