Added all the unit tests