:racehorse: Improve test running time, fix race condition