Fix test not removing temp dir. Fix taking M-to-M AvgIdentity instead of 1-to-1.