Fixed failing tests.