Improved performance tests more, updated testbed perf tests
Removing final modifier on settings