Made Tokens better, added test