Updated all unit tests