Test Accuracy fixes.