Added scrypt_tests from 1.6
Merge pull request #486 from patricklodder/1.7-dev-scrypt-test

Added scrypt_tests from 1.6