Added more test data rides
Some minor bugs fixed