Fix build file versions
Add tests and fix completion corner cases
Add more tests. One pending issue with quotes
Refactor + only present not yet provided options
Add more assertions to tokenizer
Add failing tests