Corrected error in a few tests. Need to confirm results.