Fixes unit tests.
Fixes acceleration and deceleration.