Fixed up remaining macro service tests