Simplify autocomplete
Add autocomplete tests