[CA-126770],[CA-123737]: Updated further test cases.

Signed-off-by: Konstantina Chremmou <konstantina.chremmou@citrix.com>