Improved test suite runtime drastically.