WIP Garage builder working with tests