Adding functionality to calcuators to work from a particular date range, updated tests, deleted unrequired classes. Also calculators are now created in the DatapointManagementService via a factory to facilitate testing