unit tests
Issue #148 - private keypair is not returned
Merge origin/master