Fixed failed unit tests.