Working on 0.9.10.
Refactor tests: use decorators to specify kinds..
Fix issue with generating keypairs.
Version 0.9.10