Fix test names
Fixed object tokenization

I forgot to tokenize the instance variables following the object as my
tests did not have any such objects.