fix test and perf thing