Fix the broken unit tests