Update Boat & Tests