Fix failing test suite