minor cleanup in java tests