[RIC-431] Some fixes & UTs