It seems at least testLoadLocationChildrenWithOffset in LocationServiceTest needs to be updated