Attempt to speed up tests