Simplify testing