Fix concurrency
- more tests