Doing this will also break up a bunch of the new tests into smaller ones, which is good.