* move service tests into test suite
* remove unnecessary deferred catch
* add some service tests