Fix broken unit-tests