Add more service tests