Fixing broken unit tests.