More Asyncs
More rabbits
Fix up the tests