Make tests run faster

Tests finished locally in ~12 minutes. This depends on network latency of course, but still an improvement.