Update UT + Fix NokiaComposer issue