Set Points and Test Points Fixed!!!