cleanup work in guava tests