TDI-30302: review util functions to help for the junits