Tests and updates for API