Speed up the tests after #22