More through e2e testing revealing some other bugs..

* Kill'em all..
OONIB release candidate 2 version 1.0.0