Modify Several Tests for Increased Accuracy