Improved again the token manager and its tester.