update test-suite to handle better exclusion.