Added additional test criteria