More tests and cleanup.