Restructure some of the Interface/Pattern tests.