Fix the unit tests