Fixed minor issue in RemoveToken and CreateToken, and added beginnings of unit tests.