Move more tests into the first group.