Beefed up unit test with concurrency stuff