Merge "Fix benchmark-tests"