Cleans up tests a bit. Separates perf from non-perf, and shortens some of the non-perf test times.