Fixed two failing tests.