make test is now repeatable.

Teardown needs to move database back to incarnation that contains the restore
point.

For now, we assume this is incarnation 2.