added perf and dropped legacy tests