Updated tests, changed properties of Token class (still a work in progress), updated todo list