Adds FindCommand and basic Tests