Fixes some broken things with the FindCommand. Improves FindCommandTest to be more accurate in terms of real world use.