More test cleanup (and reenable perf_test)