simplify some tests