Add TSV support and fix tests