Refactored completion tests to not set/restore auto-complete settings in 2 different places