Speed up tests about 1 minute