Fixes to tests.
Merge branch 'master' of https://github.com/davidmoreno/onion