extracted vehicle from Central, moved to common and improved tests