UsageCalculator now a static class (changed from Singleton, as it only
contains methods without state, so now they are treated as a solid static
method package). Added UsageCalculatorTests.#