Added some service_ generic methods + tests