* Added test cleanup.