Greatly improved test run time.