Restore token features unit tests after converting to rspec, and fix citation spec