Rework the performance testing