It doesn't really seems to me that this unit test belongs to this patch; can we split it to a different bug?