Fix the unit tests :)