* Use max data points to calculate interval * Fix mockCalculator to mach Calculator * Fix incorrect merge, replace queryModel with query
* Use max data points to calculate interval * Fix mockCalculator to mach Calculator * Fix incorrect merge, replace queryModel with query