Post merge fix all unit tests.