[RICPLT-2523] Update setup flow | Add UTs..........