test suite running in 3/5ths the time as before.