Add test, avoid race condition