CleanupVersionTest reorganized and adapted