Update tests for cleanup.