Adding ability to fix acceleration for tests
Adding tests
Merge remote-tracking branch 'origin/master'