Breaking up a mega-test and trying to make it more stable.