Some test cleanup.