Working on the unit tests