Updated failing tests