Upgraded TsvDataTable to support multiple use. Switched to TsvDataTable in tests.