Fixed int test for recent changes.
Fixed unit tests on windows.