Merge "Move tests: unit/benchmark"