Cut the work done by a couple of tests, as previously they took