Added service tests (breaking!)