Fixed two more breaking tests