More generalization of tests