Work on autocompletion and tests