Update s2 dep, update tests, use ids