Fixing broken unit tests
Adding Token support