Simplify test hierarchy and combine test flags