CP-8868: : Fixed unit tests

Signed-off-by: Mihaela Stoica <mihaela.stoica@citrix.com>
Merge pull request #176 from MihaelaStoica/xs64bit

CP-8868: : Fixed unit tests