Improve detection of excluded test targets