Fix and replace benchmark tests