Client and restructure for performance testing