Started fixing 32bit issues in unit tests.