Split out some tests.