fixed all unit tests