NEXUS-6591: More test cleanup