Removed uniquify (no longer used). Returned completion list to original. Corrected test