Test cleanup.

Fixes #40