Fix concurrency, add big test