More tests modified on DGCalculator