More test cleanup for issue #25