Change URI for perf tests; Some code cleanup;