New Calculators Added, Tests for those as well