Update API
Update Tests