Fixing completion tests