Add tests for concurrency
Add APIs
Fix APIs