Further simplify for testing