Disable tokenization check for now
Fix tests and add some more tests