Fixed and update java helpers for TC generation