RTF-1338 updated test and stub