Changed the unit tests