Test-code cleanup.