Update to fix broken unit tests.