Speed up testing (<10s instead of 25s)