[Finder] Shortened isSupported method like proposed and cleaned up the testcases.