java tests cleanup work