Refactor to remove VesselData class
Update tests