Autocomplete enhancement; more unit test support work