Fixed all the unit tests