add Token classes and failing tests