simplification of tests