Merge pull request #132 from velichkov/64bit_test

Rewrite the 64bit test. Fixes #131