Fix and Test