CP-5604: Updated unit tests.

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