Fixed tests after endpoint changes