Merge "Refactor ves performance test"