Fix unit tests as per the Unit Test defect log