changes for testing / token handling