Updated test code to make it easier to test token results