Fix project name in build file
Fix tokenization and add tests