Autocomplete test - More clean-up