More test cases for completion
Fix unit test
Fix unit tests
Add more completion cases