added unfinished tests for ride
removed merge conflicts