ENH simplify input testing