Fix all unit tests that failed