Fix current unit tests