Fix tests for ride
Merge branch 'dev'