Updated acceptance test selection to be more consistent.