Fixed the failing tests.