Remove CsvProvider in tests, restore reference for perf tools

A