Improvment in the unit tests