Fix failing UT's