streamline test hierarchy