Merge develop, fix secp256k1 break, complete tests.