Changed test criteria to match new data