Updated the performance tests to return results in ms.
Fixed merge conflicts.
Added info to some headers