Fix failing tests

PR should pass now :)