Shave a few seconds off tests