Fixing all unit tests.