Fix unit tets