Improve subdirs support detection (testing)