Add api_id support
Some tests