Fix performance tests, add option to toggle concatenation