Improving service tests