changed raw_input value
changed test
added token generator