Updated the unit tests