Merge "Reland "Adding unit tests for CountedCompleter""