Catch, Tests and 64-bit compatibility with Fixes

Catch added to repository, tests added to repository, and some changes for 64-bit compatible builds.