4.10 simplify tests