Test improvement
Removing TSVController stuff from TSV.
Simplifying constructor call.