Made it easier to unit test straight driving