fixing all unit tests