Move perf tests into test folder, cleanup