Attempt to speed up the tests a bit