Some fixes and Accuracy Test Improvement