Added extra criteria to existing tests