fix to exempt subtests search
undone validation
fixed merge conflicts