fix vocabulary and add the naive test