Updated tests and fixed trie
Merge branch 'master' of github.com:ethereum/pyethereum