Add ServiceUtils with tests