Reorganized test hierarchy to categorize tests.