Fixing failed unit tests.