Add some simple concurrency building blocks
Make tests compile again