Test and fix handling of incomplete data