Add more endpoints
update tests