added additional structure to Token() class for easier unit testing, updated unit test