Updating the unit testing