service: fixing tests.

related to #669.