Attaching a proper diff. Also removes one master, removes the test from a runlist, and adds the new test to the store suite.
Note that the test now only deletes the database(s) if the test passes. Otherwise the deletion will typically fail and mask the real error/problem.
Patch ready for review.