Fix broken unit tests