Add more performance tests, tweak runner etc.