Some adjustments in the unit test (x64 issues);