Moving some code into the Accumulators class
Updating unit tests