Port to XDE-1049
Fix test to comply with XDE-1049