Add more test, fix some bugs. Comment lexemes were broken
Bugfixes