Re-factor tests

* Silo tests for services
* Use testr
* Better support for services in tests

Change-Id: I77cad98c973f04dc0384e2c78cbca30089b9755b