Make some tests async to avoid thread starvation