Cleaned up test hierarchy.