Refactors more performance testing code
Merge pull request #36 from lukecampbell/qc-performance

Refactors more performance testing code