Fixed a bug, where the Vehicle conversion did not work properly
Added tests for the new conversion added in the last commit