#43 composes service unit tests and update error handling