Add conditional inclusion of tests