Re-ordered argument for macro
Got rid of unneeded macro
Added test for vehicle
Prototype of multiple registration