SI-5353 Additional tests