Added base model for garage and van. Also cleaned up tests for docking station