Speed up test suite more