Fix all unit tests