32/64 bit cleanup issue in tests.