Fixes some legacy unit tests.