ART-1167 - Include test for this