LPS-35994

Hi Eduardo,

here is the template number test and some minor bug fix.

cc'-ing: @zberentey

thanks,
Daniel