Addtion to Token, test and fix