[PLAT-3562] Improve handling when unexpected result received, fix test