Add defaultSwapDirectory, so we can change policies, some improvements to PerfTest