64 bit compat.
WIP getting tests to work. Most run, some need help.
Solved the namespacing issue with test friends; tests work now.