Remove test criteria and tag