Merge changes If7cb1cbb,I1d09ac01 into main

* changes:
  Adds more data points for benchmarking tests
  Move test zip file to assets