Cleaned up tests.

Ahem....