Refactors more performance testing code