Fixed two more tests