Speed up tests a little