Fix part of the unit tests
Pass unit tests