make deps, fix test for 64-bit