Move benchmark out of test
Add method support, but not usable now(r3 issue)