Tweaked tests and data criteria model to adjust for changes