New tests and cleanup.