More tests.

Cleanup.