Fixed two other tests