More rigid ride business rules

We now have tests that specify tighter rules on the types of rids that
are acceptable for our system.