simplify and fix performance tests

[David Bremner]

david at tethera.net writes:

> Jani noticed the alleged file notmuch-memory-test was missing.
> Austin grumbled about explicitly adding tests to a list.
> This series should give them both something else to grumble about.

Pushed,

d