Setup a branch for designing tests.
More testing work.
More testing work.
Merge branch 'test-performance'