Tests fixes

rtl