Fix test to comply with XDE-1049