Added some service tests