Restructure some tests.