MultiAutoComplete - fix #980 and test refactoring