Fix Unit tests.