Speedup tests a bit