Improve completion test cases
Merge pull request #938 from dlsniper/improved-completion-tests

Improve completion test cases