CA-142451: Unit tests

Covering changes related to CA-142451.

Signed-off-by: Flavien Quesnel <flavien.quesnel@citrix.com>