Changed name of test to allow new criterias. New utility class for common usage around criterias