Fixed the autocomplete porting issue for tests