Fixed issue #5 - tests failing when running under 64 bit