Fix existing unit tests.