Rearranging performance tests into a more logical order.
Renaming a few things for clarity
Fixed a bug in which the extracted URLs were not in expanded form.