Merge with chromaway master
fix tests
Merge branch 'master' of https://github.com/fanatid/cc-wallet-engine