Fix failing tests

WIP