Fixed two more tests.