fixed AccelerationCalculator and added tests