Fix test-cases after heart-surgery